Autogenerated HTML docs for v1.7.3.2-343-g7d43d
diff --git a/git-pull.html b/git-pull.html index 3093370..45d7919 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -428,7 +428,7 @@ <div class="paragraph"><p><repository> should be the name of a remote repository as passed to <a href="git-fetch.html">git-fetch(1)</a>. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even -a collection of refs with corresponding remote tracking branches +a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/<strong>:refs/remotes/origin/</strong>), but usually it is the name of a branch in the remote repository.</p></div> <div class="paragraph"><p>Default values for <repository> and <branch> are read from the @@ -1309,7 +1309,7 @@ and if there is not any such variable, the value on <tt>URL: ` line in `$GIT_DIR/remotes/<origin></tt> file is used.</p></div> <div class="paragraph"><p>In order to determine what remote branches to fetch (and -optionally store in the tracking branches) when the command is +optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable <tt>remote.<origin>.fetch</tt> are consulted, and if there aren’t any, <tt>$GIT_DIR/remotes/<origin></tt> @@ -1321,9 +1321,9 @@ <pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre> </div></div> <div class="paragraph"><p>A globbing refspec must have a non-empty RHS (i.e. must store -what were fetched in tracking branches), and its LHS and RHS +what were fetched in remote-tracking branches), and its LHS and RHS must end with <tt>/*</tt>. The above specifies that all remote -branches are tracked using tracking branches in +branches are tracked using remote-tracking branches in <tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div> <div class="paragraph"><p>The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward @@ -1413,7 +1413,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-11-18 00:51:23 UTC +Last updated 2010-11-25 03:13:42 UTC </div> </div> </body>
